From db9c4ad1b1abaef3c38027b9b2700d9250d13125 Mon Sep 17 00:00:00 2001 From: Julien Grall Date: Fri, 15 Jan 2021 19:29:47 +0000 Subject: [PATCH] xen/arm: livepatch: Include xen/mm.h rather than asm/mm.h MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Livepatch fails to build on Arm after commit ced9795c6cb4 "mm: split out mfn_t / gfn_t / pfn_t definitions and helpers": In file included from livepatch.c:13:0: /oss/xen/xen/include/asm/mm.h:32:28: error: field ‘list’ has incomplete type struct page_list_entry list; ^~~~ /oss/xen/xen/include/asm/mm.h:53:43: error: ‘MAX_ORDER’ undeclared here (not in a function); did you mean ‘PFN_ORDER’? unsigned long first_dirty:MAX_ORDER + 1; ^~~~~~~~~ PFN_ORDER /oss/xen/xen/include/asm/mm.h:53:31: error: bit-field ‘first_dirty’ width not an integer constant unsigned long first_dirty:MAX_ORDER + 1; ^~~~~~~~~~~ This is happening because asm/mm.h is included directly by livepatch.c. Yet it depends on xen/mm.h to be included first so MAX_ORDER is defined. Resolve the build failure by including xen/mm.h rather than asm/mm.h. Fixes: ced9795c6cb4 ("mm: split out mfn_t / gfn_t / pfn_t definitions and helpers") Signed-off-by: Julien Grall Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Stefano Stabellini --- xen/arch/arm/livepatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/livepatch.c b/xen/arch/arm/livepatch.c index 915e9d926a..75e8adcfd6 100644 --- a/xen/arch/arm/livepatch.c +++ b/xen/arch/arm/livepatch.c @@ -6,11 +6,11 @@ #include #include #include +#include #include #include #include -#include /* Override macros from asm/page.h to make them work with mfn_t */ #undef virt_to_mfn -- 2.30.2